*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 954ff20d4e8a4dd2e478177e85678e0eb5e94085..c0ab0b5471e1a45999e3ac56c29a152d23caaef6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -27,7 +27,6 @@
        * emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for
        lexical-let when encountering ((lambda (...) ...) ...).
 
->>>>>>> 1.8828
 2005-12-17  Chong Yidong  <cyd@stupidchicken.com>
 
        * progmodes/sh-script.el (sh-mode):